From d55073fde64a7d1ed8bb8c484c725e30c2b7e473 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sun, 5 Dec 2010 14:40:35 +0100
Subject: [PATCH] gdk: Remove depth argument from GdkWindowImpl->get_geometry()

---
 gdk/gdkoffscreenwindow.c      | 5 +----
 gdk/gdkwindow.c               | 3 +--
 gdk/gdkwindowimpl.h           | 3 +--
 gdk/quartz/gdkwindow-quartz.c | 6 +-----
 gdk/win32/gdkwindow-win32.c   | 5 +----
 gdk/x11/gdkwindow-x11.c       | 5 +----
 6 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/gdk/gdkoffscreenwindow.c b/gdk/gdkoffscreenwindow.c
index 9ade91bee1..1731f45dad 100644
--- a/gdk/gdkoffscreenwindow.c
+++ b/gdk/gdkoffscreenwindow.c
@@ -549,8 +549,7 @@ gdk_offscreen_window_get_geometry (GdkWindow *window,
 				   gint      *x,
 				   gint      *y,
 				   gint      *width,
-				   gint      *height,
-				   gint      *depth)
+				   gint      *height)
 {
   if (!GDK_WINDOW_DESTROYED (window))
     {
@@ -562,8 +561,6 @@ gdk_offscreen_window_get_geometry (GdkWindow *window,
 	*width = window->width;
       if (height)
 	*height = window->height;
-      if (depth)
-	*depth = window->depth;
     }
 }
 
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 4ab9a26e5d..7ac839640f 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -6859,8 +6859,7 @@ gdk_window_get_geometry (GdkWindow *window,
 	{
 	  impl_class = GDK_WINDOW_IMPL_GET_CLASS (window->impl);
 	  impl_class->get_geometry (window, x, y,
-				    width, height,
-				    NULL);
+				    width, height);
 	  /* This reports the position wrt to the native parent, we need to convert
 	     it to be relative to the client side parent */
 	  parent = window->parent;
diff --git a/gdk/gdkwindowimpl.h b/gdk/gdkwindowimpl.h
index 0332a31b71..af2d922c42 100644
--- a/gdk/gdkwindowimpl.h
+++ b/gdk/gdkwindowimpl.h
@@ -91,8 +91,7 @@ struct _GdkWindowImplClass
                                          gint            *x,
                                          gint            *y,
                                          gint            *width,
-                                         gint            *height,
-                                         gint            *depth);
+                                         gint            *height);
   gint         (* get_root_coords)      (GdkWindow       *window,
 					 gint             x,
 					 gint             y,
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 40b9dbb854..a27163ca4b 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -1645,8 +1645,7 @@ gdk_window_quartz_get_geometry (GdkWindow *window,
                                 gint      *x,
                                 gint      *y,
                                 gint      *width,
-                                gint      *height,
-                                gint      *depth)
+                                gint      *height)
 {
   GdkWindowImplQuartz *impl;
   GdkWindowObject *private;
@@ -1713,9 +1712,6 @@ gdk_window_quartz_get_geometry (GdkWindow *window,
       if (height)
         *height = ns_rect.size.height;
     }
-    
-  if (depth)
-      *depth = gdk_visual_get_depth (gdk_window_get_visual (window));
 }
 
 static gint
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index bcbdca33a1..549f7a38ac 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -1800,8 +1800,7 @@ gdk_win32_window_get_geometry (GdkWindow *window,
 			       gint      *x,
 			       gint      *y,
 			       gint      *width,
-			       gint      *height,
-			       gint      *depth)
+			       gint      *height)
 {
   if (!window)
     window = _gdk_root;
@@ -1848,8 +1847,6 @@ gdk_win32_window_get_geometry (GdkWindow *window,
 	*width = rect.right - rect.left;
       if (height)
 	*height = rect.bottom - rect.top;
-      if (depth)
-	*depth = gdk_window_get_visual (window)->depth;
 
       GDK_NOTE (MISC, g_print ("gdk_win32_window_get_geometry: %p: %ldx%ldx%d@%+ld%+ld\n",
 			       GDK_WINDOW_HWND (window),
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 51ded44f60..d3b1992855 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -2739,8 +2739,7 @@ gdk_window_x11_get_geometry (GdkWindow *window,
                              gint      *x,
                              gint      *y,
                              gint      *width,
-                             gint      *height,
-                             gint      *depth)
+                             gint      *height)
 {
   Window root;
   gint tx;
@@ -2764,8 +2763,6 @@ gdk_window_x11_get_geometry (GdkWindow *window,
 	*width = twidth;
       if (height)
 	*height = theight;
-      if (depth)
-	*depth = tdepth;
     }
 }
 
-- 
2.30.2